From f1848e53f2ae35f42efdbfcec2ebae6480befaa7 Mon Sep 17 00:00:00 2001 From: oliskoli Date: Sun, 2 Jul 2006 15:14:36 +0000 Subject: [PATCH] Update release numbers for upcomming GPSBabel 1.3. --- gpsbabel/win32/gui-2/GPSBabelGUI.dof | 10 +-- gpsbabel/win32/gui-2/GPSBabelGUI.res | Bin 1816 -> 1740 bytes gpsbabel/win32/gui-2/common.pas | 6 +- gpsbabel/win32/gui-2/gpsbabel.iss | 11 ++-- gpsbabel/win32/gui-2/gpsbabel.po | 89 ++++++++++++--------------- gpsbabel/win32/gui-2/main.pas | 6 +- gpsbabel/win32/gui-2/options.pas | 5 +- gpsbabel/win32/gui-2/utils.pas | 4 +- 8 files changed, 61 insertions(+), 70 deletions(-) diff --git a/gpsbabel/win32/gui-2/GPSBabelGUI.dof b/gpsbabel/win32/gui-2/GPSBabelGUI.dof index f3d14f909..e9e83cf25 100644 --- a/gpsbabel/win32/gui-2/GPSBabelGUI.dof +++ b/gpsbabel/win32/gui-2/GPSBabelGUI.dof @@ -56,8 +56,8 @@ IncludeVerInfo=1 AutoIncBuild=0 MajorVer=0 MinorVer=2 -Release=3 -Build=4 +Release=4 +Build=0 Debug=0 PreRelease=0 Special=0 @@ -68,14 +68,14 @@ CodePage=1252 [Version Info Keys] CompanyName=GPSBabel Makers FileDescription=GPSBabel Windows Frontend -FileVersion=0.2.3.4 +FileVersion=0.2.4 InternalName= LegalCopyright=(C) 2005-2006 Olaf Klein (O.B.Klein@T-Online.de) LegalTrademarks= OriginalFilename=GPSBabelGUI.exe ProductName=GPSBabel -ProductVersion=1.2.8-beta20060420_ds -Comments=internal test build +ProductVersion=1.3 +Comments= [HistoryLists\hlConditionals] Count=1 Item0=MSWINDOWS diff --git a/gpsbabel/win32/gui-2/GPSBabelGUI.res b/gpsbabel/win32/gui-2/GPSBabelGUI.res index 5d98c3b1573ebb9d61a9b6e024254fb14af07f6b..9d20882f9b9fd759a4c1013f07e56d51e21d117d 100644 GIT binary patch delta 102 zcmbQicZPRE4l|>}m6obr|e38u^0G_@TiU0rr delta 160 zcmX@ZJA-dS4l`rVwLlQ$OLkUA7gAs!P5Sjt8378$vkit+5 uG}3`VWO6>6sA?ud9#CB>LlKZpWXNGq0P~80qyo^4Qie>RSjyy9Hg^C#S0RA_ diff --git a/gpsbabel/win32/gui-2/common.pas b/gpsbabel/win32/gui-2/common.pas index 53d632743..402828f3d 100644 --- a/gpsbabel/win32/gui-2/common.pas +++ b/gpsbabel/win32/gui-2/common.pas @@ -358,15 +358,12 @@ var buff: array[0..1023] of Char; cin, cend: PChar; i: Integer; - scaps: string; ext: string; comment: string; name: string; internal: string; - caps: Integer; - info: PFileInfo; begin @@ -399,7 +396,7 @@ begin comment := StrPas(cin); if (Length(comment) = 0) or (Length(name) = 0) then break; - if (comment[1] = '?') then break; +// if (comment[1] = '?') then break; caps := 0; for i := 1 to Length(scaps) do @@ -519,6 +516,7 @@ end; function TCapabilities.IsFile(Index: Integer): Boolean; var info: PFileInfo; + name: string; begin info := PFileInfo(Objects[Index]); Result := (AnsiCompareText(info.Internal, 'file') = 0); diff --git a/gpsbabel/win32/gui-2/gpsbabel.iss b/gpsbabel/win32/gui-2/gpsbabel.iss index 0cf06c22c..0418941e9 100644 --- a/gpsbabel/win32/gui-2/gpsbabel.iss +++ b/gpsbabel/win32/gui-2/gpsbabel.iss @@ -1,8 +1,8 @@ ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! -#define Version "1.2.8" -#define Release "-beta20060420_ds" +#define Version "1.3" +#define Release "" [Setup] AppName=GPSBabel @@ -33,6 +33,7 @@ DisableStartupPrompt=true AppID={{E25E9E85-2244-4AB0-B00D-7F44C6E9F635} AppMutex=GPSBabelGUI_mutex OutputBaseFilename=iGPSBabel-{#Version}{#Release} +UsePreviousAppDir=false [Tasks] Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked @@ -44,15 +45,15 @@ Source: README.gui; DestDir: {app} Source: ..\..\mingw\libexpat.dll; DestDir: {app} ; Source: ..\..\mingw\sqlite3.dll; DestDir: {app} Source: ..\..\gpsbabel.exe; DestDir: {app}; Flags: comparetimestamp ignoreversion; Languages: -Source: ..\..\README.xml; DestDir: {app} -Source: ..\..\README.html; DestDir: {app} +Source: ..\..\gpsbabel.html; DestDir: {app}; Tasks: ; Languages: Source: ..\..\COPYING; DestDir: {app} Source: ..\..\README.contrib; DestDir: {app} Source: ..\..\README.igc; DestDir: {app} Source: ..\..\README.magnav; DestDir: {app} Source: ..\..\README.mapconverter; DestDir: {app} Source: ..\..\README.psp; DestDir: {app} -Source: ..\..\AUTHORS; DestDir: {app} +Source: ..\..\AUTHORS; DestDir: {app}; Tasks: ; Languages: +Source: ..\..\CHANGELOG; DestDir: {app} [Dirs] Name: {app} diff --git a/gpsbabel/win32/gui-2/gpsbabel.po b/gpsbabel/win32/gui-2/gpsbabel.po index 8f945f131..15a42c7f0 100644 --- a/gpsbabel/win32/gui-2/gpsbabel.po +++ b/gpsbabel/win32/gui-2/gpsbabel.po @@ -34,13 +34,10 @@ msgstr "" msgid "Category name (Cache)" msgstr "" -msgid "Color for lines or mapnotes" -msgstr "" - -msgid "color index [1-9] for routes" +msgid "Category number to use for written waypoints" msgstr "" -msgid "color index [1-9] for waypoint names" +msgid "Color for lines or mapnotes" msgstr "" msgid "Command unit to power itself down" @@ -64,36 +61,27 @@ msgstr "" msgid "Days after which points are considered old" msgstr "" -msgid "Default category on output (1..16)" +msgid "Decimal seconds to pause between groups of strings" msgstr "" -msgid "Default icon name" +msgid "Default category on output (1..16)" msgstr "" -msgid "Delete all waypoints" +msgid "Default icon name" msgstr "" -msgid "dimmer factor of map in %" +msgid "Default speed for waypoints (knots/hr)" msgstr "" -msgid "Display the file header bytes" +msgid "Delete all waypoints" msgstr "" -msgid "Distance unit [m=metric, s=statue]" +msgid "Distance unit [m=metric, s=statute]" msgstr "" msgid "Do not add geocache data to description" msgstr "" -msgid "Don't write GPGGA sentences" -msgstr "" - -msgid "Don't write GPGSA sentences" -msgstr "" - -msgid "Don't write GPVTG sentences" -msgstr "" - msgid "Drop route points that do not have an equivalent waypoint (hidden points)" msgstr "" @@ -103,13 +91,13 @@ msgstr "" msgid "Encrypt hints with ROT13" msgstr "" -msgid "Export linestrings for tracks and routes" +msgid "Erase device data after download" msgstr "" -msgid "Export placemarks for tracks and routes" +msgid "Export linestrings for tracks and routes" msgstr "" -msgid "font index [1-] for waypoint names" +msgid "Export placemarks for tracks and routes" msgstr "" msgid "Full path to XCSV style file" @@ -175,6 +163,9 @@ msgstr "" msgid "Make synth. shortnames unique" msgstr "" +msgid "MapSend version TRK file to generate (3,4)" +msgstr "" + msgid "Margin for map. Degrees or percentage" msgstr "" @@ -202,15 +193,18 @@ msgstr "" msgid "Merge output with existing file" msgstr "" -msgid "name of map" -msgstr "" - msgid "Name of the 'unassigned' category" msgstr "" msgid "New name for the route" msgstr "" +msgid "No separator lines between waypoints" +msgstr "" + +msgid "No whitespace in generated shortnames" +msgstr "" + msgid "Non-stealth encrypted icon name" msgstr "" @@ -229,9 +223,6 @@ msgstr "" msgid "Path to HTML style sheet" msgstr "" -msgid "Pause between groups of strings" -msgstr "" - msgid "Precision of coordinates" msgstr "" @@ -244,30 +235,42 @@ msgstr "" msgid "Read control points as waypoint/route/none" msgstr "" +msgid "Read/Write date format (i.e. DDMMYYYY)" +msgstr "" + msgid "Read/Write date format (i.e. yyyy/mm/dd)" msgstr "" +msgid "Read/write GPGGA sentences" +msgstr "" + +msgid "Read/write GPGSA sentences" +msgstr "" + +msgid "Read/write GPRMC sentences" +msgstr "" + +msgid "Read/write GPVTG sentences" +msgstr "" + msgid "Read/Write time format (i.e. HH:mm:ss xx)" msgstr "" msgid "Return current position as a waypoint" msgstr "" -msgid "set text background to transparent" +msgid "Road type changes" msgstr "" msgid "Shortname is MAC address" msgstr "" -msgid "size index [101-] for routes" +msgid "Split input into separate files" msgstr "" msgid "Split into multiple routes at turns" msgstr "" -msgid "State map format to write, default=CA" -msgstr "" - msgid "Stealth encrypted icon name" msgstr "" @@ -301,16 +304,13 @@ msgstr "" msgid "Target GPX version for output" msgstr "" -msgid "Temperature unit [c=celsius, f=fahrenheit]" -msgstr "" - -msgid "text size [101-] for waypoint names" +msgid "Temperature unit [c=Celsius, f=Fahrenheit]" msgstr "" msgid "The icon description is already the marker" msgstr "" -msgid "Type of .an1 file (see README)" +msgid "Type of .an1 file" msgstr "" msgid "UPPERCASE synth. shortnames" @@ -319,9 +319,6 @@ msgstr "" msgid "Use depth values on output (default is ignore)" msgstr "" -msgid "use file of parameters (parameters on command line overwrites file parameters)" -msgstr "" - msgid "Use proximity values on output (default is ignore)" msgstr "" @@ -340,7 +337,7 @@ msgstr "" msgid "Waypoint foreground color" msgstr "" -msgid "Waypoint type (marker,text,mapnote,circle)" +msgid "Waypoint type" msgstr "" msgid "Width in pixels of map" @@ -349,18 +346,12 @@ msgstr "" msgid "Width of lines, in pixels" msgstr "" -msgid "Write GPRMC sentences" -msgstr "" - msgid "Write timestamps with offset x to UTC time" msgstr "" msgid "Write tracks compatible with Carto Exploreur" msgstr "" -msgid "zoom factor of map in %" -msgstr "" - msgid "Zoom level to reduce points" msgstr "" diff --git a/gpsbabel/win32/gui-2/main.pas b/gpsbabel/win32/gui-2/main.pas index 44c578746..60bddbb07 100644 --- a/gpsbabel/win32/gui-2/main.pas +++ b/gpsbabel/win32/gui-2/main.pas @@ -372,7 +372,7 @@ begin LoadFileFormats; // ? valid README form - s := ExtractFilePath(ParamStr(0)) + 'readme.html'; + s := ExtractFilePath(ParamStr(0)) + 'gpsbabel.html'; acHelpReadme.Enabled := FileExists(s) or (frmReadme.Memo.Lines.Count > 0); end; @@ -907,9 +907,9 @@ procedure TfrmMain.acHelpReadmeExecute(Sender: TObject); var s: string; begin - s := ExtractFilePath(ParamStr(0)) + 'readme.html'; + s := ExtractFilePath(ParamStr(0)) + 'gpsbabel.html'; if FileExists(s) then - WinOpenFile(s, '') // new readme.html + WinOpenFile(s, '') // new gpsbabel.html else begin // show the old readme if (frmReadme = nil) then Application.CreateForm(TfrmReadme, frmReadme); diff --git a/gpsbabel/win32/gui-2/options.pas b/gpsbabel/win32/gui-2/options.pas index a8953bddc..6eb98c2d7 100644 --- a/gpsbabel/win32/gui-2/options.pas +++ b/gpsbabel/win32/gui-2/options.pas @@ -237,7 +237,8 @@ begin 1: CreateIntegerOption(xy.X, xy.Y - 2, i + 1, o, xmax); 2, 3: CreateStringOption(xy.X, xy.Y - 2, i + 1, o, xmax); 4: ; - 5: if FIsInput then CreateFileOption(xy.X, xy.Y - 2, i + 1, o, True, xmax); + 5: // ??? if FIsInput then + CreateFileOption(xy.X, xy.Y - 2, i + 1, o, True, xmax); 6: if not FIsInput then CreateFileOption(xy.X, xy.Y - 2, i + 1, o, False, xmax); end; if (o.edit <> nil) then @@ -468,7 +469,7 @@ end; procedure TfrmOptions.btnHelpClick(Sender: TObject); begin - WinOpenURL(readme_html_path + '#' + FFormat); + WinOpenURL(readme_html_path + '#fmt_' + FFormat); end; procedure TfrmOptions.CreateFileOption(const x, y, tag: Integer; o: POption; IsInput: Boolean; xmax: Integer = -1); diff --git a/gpsbabel/win32/gui-2/utils.pas b/gpsbabel/win32/gui-2/utils.pas index 427502ae5..651dacf3d 100644 --- a/gpsbabel/win32/gui-2/utils.pas +++ b/gpsbabel/win32/gui-2/utils.pas @@ -394,7 +394,7 @@ end; function readme_html_path: string; begin - Result := ExtractFilePath(ParamStr(0)) + 'readme.html'; + Result := ExtractFilePath(ParamStr(0)) + 'gpsbabel.html'; if FileExists(Result) then begin while (Pos('\', Result) <> 0) do @@ -402,7 +402,7 @@ begin Result := 'file:///' + Result; end else - Result := SGPSBabelURL + '/readme.html'; + Result := SGPSBabelURL + '/gpsbabel.html'; end; function HasUpDown(E: TEdit; var UpDown: TUpdown): Boolean; -- 2.30.2